Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 15 Nov 2011 00:00:54 +0000 (16:00 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 15 Nov 2011 00:00:54 +0000 (16:00 -0800)
commita8172bf31136eafec88d9172b4ad24ee7ed2fdd8
tree8807670bc14b5e47690e248ff56e8869d29cd6ad
parentbbb49cf3db64db4100065ae3d3dc4179a267d77a
parente28e5577a9d77c6f916bdfdf689ddf0460ed3f2b
Merge from trunk.